Merge branch 'upstream'
authorBernd Zeimetz <bernd@bzed.de>
Wed, 16 May 2012 19:16:00 +0000 (21:16 +0200)
committerBernd Zeimetz <bernd@bzed.de>
Wed, 16 May 2012 19:16:00 +0000 (21:16 +0200)
commit0754cb6136b24857718d3ac34d356bb24ab1046d
treea4422f5d2d54e56ea02b7bebdff5c3e6690ffef4
parent7b93962b83b1a85f4ef21ee999f21f5fd0a76b8c
parentb3e82bd90ac35f12522201d6d17aafa31f168197
Merge branch 'upstream'